Changes to support week_start values other than 0 and 1, e.g. 6 will let

Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcalendar.c (gtk_calendar_compute_days):
	* gtk/gtkcalendar.c (gtk_calendar_paint_day_names):
	* gtk/gtkcalendar.c (gtk_calendar_init): Changes to support
	week_start values other than 0 and 1, e.g. 6 will let weeks start
	on Saturday.  (#130353, Roozbeh Pournader)

diff --git a/ChangeLog b/ChangeLog
index e5cbee42ddb91037311ba18cbfeae21de1d9294e..958a63fbf8f11eb2d1310f6740dc77dfad742499 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_compute_days): 
+       * gtk/gtkcalendar.c (gtk_calendar_paint_day_names): 
+       * gtk/gtkcalendar.c (gtk_calendar_init): Changes to support 
+       week_start values other than 0 and 1, e.g. 6 will let weeks start
+       on Saturday.  (#130353, Roozbeh Pournader) 
+
 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
 
         * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e5cbee42ddb91037311ba18cbfeae21de1d9294e..958a63fbf8f11eb2d1310f6740dc77dfad742499 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_compute_days): 
+       * gtk/gtkcalendar.c (gtk_calendar_paint_day_names): 
+       * gtk/gtkcalendar.c (gtk_calendar_init): Changes to support 
+       week_start values other than 0 and 1, e.g. 6 will let weeks start
+       on Saturday.  (#130353, Roozbeh Pournader) 
+
 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
 
         * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e5cbee42ddb91037311ba18cbfeae21de1d9294e..958a63fbf8f11eb2d1310f6740dc77dfad742499 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_compute_days): 
+       * gtk/gtkcalendar.c (gtk_calendar_paint_day_names): 
+       * gtk/gtkcalendar.c (gtk_calendar_init): Changes to support 
+       week_start values other than 0 and 1, e.g. 6 will let weeks start
+       on Saturday.  (#130353, Roozbeh Pournader) 
+
 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
 
         * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e5cbee42ddb91037311ba18cbfeae21de1d9294e..958a63fbf8f11eb2d1310f6740dc77dfad742499 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_compute_days): 
+       * gtk/gtkcalendar.c (gtk_calendar_paint_day_names): 
+       * gtk/gtkcalendar.c (gtk_calendar_init): Changes to support 
+       week_start values other than 0 and 1, e.g. 6 will let weeks start
+       on Saturday.  (#130353, Roozbeh Pournader) 
+
 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
 
         * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e5cbee42ddb91037311ba18cbfeae21de1d9294e..958a63fbf8f11eb2d1310f6740dc77dfad742499 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Fri Jan  2 02:50:11 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_compute_days): 
+       * gtk/gtkcalendar.c (gtk_calendar_paint_day_names): 
+       * gtk/gtkcalendar.c (gtk_calendar_init): Changes to support 
+       week_start values other than 0 and 1, e.g. 6 will let weeks start
+       on Saturday.  (#130353, Roozbeh Pournader) 
+
 2003-12-31 13:49 Daniel Rogers <dsrogers@phasevelocity.org>
 
         * gdk/x11/gdkinput-x11.c: (gdk_input_translate_coordinates)

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 2a117759ba255b65ca9636c43f72d4f6d5c35dc5..dd889efc6615660c46b8651ce24b5bff5f6f2b5e 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -712,18 +712,22 @@ gtk_calendar_init (GtkCalendar *calendar)
   else if (strcmp (year_before, "calendar:MY") != 0)
     g_warning ("Whoever translated calendar:MY did so wrongly.\n");
 
-  /* Translate to calendar:week_start:1 if you want Monday to be the
-   * first day of the week; otherwise translate to calendar:week_start:0. 
-   * Do *not* translate it to anything else, if it isn't calendar:week_start:1 
-   * or calendar:week_start:0 it will not work.
-   */
-   week_start = _("calendar:week_start:0");
-   if (strcmp (week_start, "calendar:week_start:1") == 0)
-     private_data->week_start = 1;
-   else if (strcmp (week_start, "calendar:week_start:0") == 0) 
-     private_data->week_start = 0;
-   else
-     g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
+  /* Translate to calendar:week_start:0 if you want Sunday to be the
+   * first day of the week to calendar:week_start:1 if you want Monday
+   * to be the first day of the week, and so on.
+   */  
+  week_start = _("calendar:week_start:0");
+
+  if (strncmp (week_start, "calendar:week_start:", 20) == 0)
+    private_data->week_start = *(week_start + 20) - '0';
+  else 
+    private_data->week_start = -1;
+  
+  if (private_data->week_start < 0 || private_data->week_start > 6)
+    {
+      g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
+      private_data->week_start = 0;
+    }
 }
 
 GtkWidget*
@@ -1915,8 +1919,7 @@ gtk_calendar_paint_day_names (GtkWidget *widget)
        day = 6 - i;
       else
        day = i;
-      if (private_data->week_start == 1) 
-       day= (day+1)%7;
+      day = (day + private_data->week_start) % 7;
       g_snprintf (buffer, sizeof (buffer), "%s", default_abbreviated_dayname[day]);
 
       pango_layout_set_text (layout, buffer, -1);
@@ -2229,7 +2232,7 @@ gtk_calendar_compute_days (GtkCalendar *calendar)
   gint row;
   gint col;
   gint day;
-  
+
   g_return_if_fail (GTK_IS_CALENDAR (calendar));
 
   private_data = GTK_CALENDAR_PRIVATE_DATA (GTK_WIDGET (calendar));
@@ -2240,12 +2243,7 @@ gtk_calendar_compute_days (GtkCalendar *calendar)
   ndays_in_month = month_length[leap (year)][month];
   
   first_day = day_of_week (year, month, 1);
-  
-  if (private_data->week_start == 1)
-    first_day--;
-  else
-    first_day %= 7;
-  
+  first_day = (first_day + 7 - private_data->week_start) % 7;
   
   /* Compute days of previous month */
   if (month > 1)